Run through gofmt
Remove old testing code