Clean up golint warnings