golint cleanup
Merge pull request #22 from mistifyio/cleanup

golint cleanup