refactor towards go_lint requirements
Merge pull request #5 from adeven/go_lint

Refactor to address golint errors & warnings