Reformatted code and removed cruft

I actually do NOT like gofmt. Or maybe I need to set it up to something
better than tabwidth 8.