Cleanup code, fix govet
apply golint
make -> literal
inline short function and group them
Merge pull request #5 from creack/cleanup

Cleanup