gofmt
Simplifies some definitions
typo
formatting
Merge pull request #1 from raliste/master

gofmt and simplification of definitions