diff --git a/client.go b/client.go
index 1efd5a5..824e200 100644
--- a/client.go
+++ b/client.go
@@ -558,7 +558,7 @@ func updateUpBitrate(g *group, up *upConnection) {
 						continue
 					}
 
-					if now - ms > 5000 {
+					if now-ms > 5000 {
 						continue
 					}
 
@@ -587,7 +587,7 @@ func sendREMB(pc *webrtc.PeerConnection, ssrc uint32, bitrate uint64) error {
 	return pc.WriteRTCP([]rtcp.Packet{
 		&rtcp.ReceiverEstimatedMaximumBitrate{
 			Bitrate: bitrate,
-			SSRCs: []uint32{ssrc},
+			SSRCs:   []uint32{ssrc},
 		},
 	})
 }
diff --git a/group.go b/group.go
index 4fc7c4f..afe65ed 100644
--- a/group.go
+++ b/group.go
@@ -117,13 +117,13 @@ func addGroup(name string, desc *groupDescription) (*group, error) {
 	if groups.groups == nil {
 		groups.groups = make(map[string]*group)
 		s := webrtc.SettingEngine{}
-		s.SetTrickle(true);
+		s.SetTrickle(true)
 		m := webrtc.MediaEngine{}
 		m.RegisterCodec(webrtc.NewRTPVP8CodecExt(
 			webrtc.DefaultPayloadTypeVP8, 90000,
 			[]webrtc.RTCPFeedback{
-				webrtc.RTCPFeedback{"goog-remb", ""},
-				webrtc.RTCPFeedback{"nack", "pli"},
+				{"goog-remb", ""},
+				{"nack", "pli"},
 			},
 			"",
 		))