diff --git a/bundle.go b/bundle.go
index a96b2fc..c3dac53 100644
--- a/bundle.go
+++ b/bundle.go
@@ -72,19 +72,20 @@ func BundleFromBytes(bytes []byte) (*OSCBundle, []byte, error) {
 
 		bundleContentBytes := remainingBytes[0:contentSize]
 
-		if bundleContentBytes[0] == 35 {
+		switch bundleContentBytes[0] {
+		case 35: // #
 			content, _, err := BundleFromBytes(bundleContentBytes)
 			if err != nil {
 				return nil, remainingBytes, err
 			}
 			bundleContents = append(bundleContents, content)
-		} else if bundleContentBytes[0] == 47 {
+		case 47: // /
 			content, err := MessageFromBytes(bundleContentBytes)
 			if err != nil {
 				return nil, remainingBytes, err
 			}
 			bundleContents = append(bundleContents, content)
-		} else {
+		default:
 			return nil, remainingBytes, errors.New("bundle contents does not look a bundle or message")
 		}
 		remainingBytes = bytesAfterContentSize[contentSize:]
diff --git a/cmd/makeosc/makeosc.go b/cmd/makeosc/makeosc.go
index e28cff0..b27c1c8 100644
--- a/cmd/makeosc/makeosc.go
+++ b/cmd/makeosc/makeosc.go
@@ -141,11 +141,12 @@ func slipEncode(bytes []byte) []byte {
 	var encodedBytes = []byte{END}
 
 	for _, byteToEncode := range bytes {
-		if byteToEncode == END {
+		switch byteToEncode {
+		case END:
 			encodedBytes = append(encodedBytes, ESC, ESC_END)
-		} else if byteToEncode == ESC {
+		case ESC:
 			encodedBytes = append(encodedBytes, ESC, ESC_ESC)
-		} else {
+		default:
 			encodedBytes = append(encodedBytes, byteToEncode)
 		}
 	}
@@ -178,8 +179,5 @@ func makeMsg(address string, args []string, types []string, slip bool) {
 	if slip {
 		oscMessageBuffer = slipEncode(oscMessageBuffer)
 	}
-
-	//TODO write buffer to stdout
 	os.Stdout.Write(oscMessageBuffer)
-
 }
diff --git a/cmd/receiveosc/receiveosc.go b/cmd/receiveosc/receiveosc.go
index cf34f65..35a74a6 100644
--- a/cmd/receiveosc/receiveosc.go
+++ b/cmd/receiveosc/receiveosc.go
@@ -120,9 +120,10 @@ func (s *SLIP) decode(bytes []byte) {
 		}
 
 		if escapeNext {
-			if packetByte == ESC_END {
+			switch packetByte {
+			case ESC_END:
 				s.pendingBytes = append(s.pendingBytes, END)
-			} else if packetByte == ESC_ESC {
+			case ESC_ESC:
 				s.pendingBytes = append(s.pendingBytes, ESC)
 			}
 			escapeNext = false
diff --git a/cmd/sendosc/sendosc.go b/cmd/sendosc/sendosc.go
index 8a7d76e..e2fb827 100644
--- a/cmd/sendosc/sendosc.go
+++ b/cmd/sendosc/sendosc.go
@@ -169,11 +169,12 @@ func slipEncode(bytes []byte) []byte {
 	var encodedBytes = []byte{END}
 
 	for _, byteToEncode := range bytes {
-		if byteToEncode == END {
+		switch byteToEncode {
+		case END:
 			encodedBytes = append(encodedBytes, ESC, ESC_END)
-		} else if byteToEncode == ESC {
+		case ESC:
 			encodedBytes = append(encodedBytes, ESC, ESC_ESC)
-		} else {
+		default:
 			encodedBytes = append(encodedBytes, byteToEncode)
 		}
 	}
diff --git a/osc.go b/osc.go
index 599cd04..7575a28 100644
--- a/osc.go
+++ b/osc.go
@@ -311,7 +311,7 @@ func readOSCArg(bytes []byte, oscType string) (OSCArg, []byte, error) {
 	oscArg := OSCArg{}
 	oscArg.Type = oscType
 
-	remainingBytes := []byte{}
+	var remainingBytes []byte
 	//TODO(jwetzell): add error handling
 	switch oscType {
 	case "s":