Gofmt, cleanup a little in demo.