Fixing golint warnings
Merge pull request #695 from danmcp/fix_golint_warnings

Fixing golint warnings