Cleaned up some golint