Fixing golint warnings.