Fixing golint warnings