Seem to kind of fix the things

Seem to have fixed the things!

ProTip: Run `go fmt` before committing code.