Apply `gofmt` to all *.go files
Clarify what the comments apply to

...by moving them into their conditional scope.
Merge pull request #8 from JensRantil/code-formatting

Code formatting