diff --git a/sync/atomicflag.go b/sync/atomicflag.go
new file mode 100644
index 0000000..e33e77a
--- /dev/null
+++ b/sync/atomicflag.go
@@ -0,0 +1,26 @@
+package sync
+
+import "sync/atomic"
+
+type AtomicFlag struct {
+	v uint32
+}
+
+func (a *AtomicFlag) Set() bool {
+	return atomic.CompareAndSwapUint32(&a.v, 0, 1)
+}
+
+func (a *AtomicFlag) Clear() bool {
+	return atomic.CompareAndSwapUint32(&a.v, 1, 0)
+}
+
+func (a *AtomicFlag) IsSet() bool {
+	return atomic.LoadUint32(&a.v) == 1
+}
+
+func (a *AtomicFlag) String() string {
+	if a.IsSet() {
+		return "true"
+	}
+	return "false"
+}
diff --git a/sync/spinlock.go b/sync/spinlock.go
index 3397b14..267ddb3 100644
--- a/sync/spinlock.go
+++ b/sync/spinlock.go
@@ -1,20 +1,15 @@
-package spinlock
+package sync
 
-import (
-	"runtime"
-	"sync/atomic"
-)
-
-var state = [2]string{"Unlocked", "Locked"}
+import "runtime"
 
 // SpinLock implements a simple atomic spin lock, the zero value for a SpinLock is an unlocked spinlock.
 type SpinLock struct {
-	l uint32
+	v AtomicFlag
 }
 
 // Lock locks sl. If the lock is already in use, the caller blocks until Unlock is called
 func (sl *SpinLock) Lock() {
-	for !atomic.CompareAndSwapUint32(&sl.l, 0, 1) {
+	for !sl.v.Set() {
 		runtime.Gosched() //allow other goroutines to do stuff.
 	}
 }
@@ -22,14 +17,17 @@ func (sl *SpinLock) Lock() {
 // Unlock unlocks sl, unlike [Mutex.Unlock](http://golang.org/pkg/sync/#Mutex.Unlock),
 // there's no harm calling it on an unlocked SpinLock
 func (sl *SpinLock) Unlock() {
-	atomic.StoreUint32(&sl.l, 0)
+	sl.v.Clear()
 }
 
 // TryLock will try to lock sl and return whether it succeed or not without blocking.
 func (sl *SpinLock) TryLock() bool {
-	return atomic.CompareAndSwapUint32(&sl.l, 0, 1)
+	return sl.v.Set()
 }
 
 func (sl *SpinLock) String() string {
-	return state[sl.l]
+	if sl.v.IsSet() {
+		return "Locked"
+	}
+	return "Unlocked"
 }
diff --git a/sync/spinlock_test.go b/sync/spinlock_test.go
index ae8a7db..21263f7 100644
--- a/sync/spinlock_test.go
+++ b/sync/spinlock_test.go
@@ -1,4 +1,4 @@
-package spinlock
+package sync
 
 import (
 	"sync"