Clean things up, and make them more... go-like.
go fmt