Merge pull request #20 from fkautz/pr_out_running_gofmt

Run gofmt -s (simplify).