Cleanup and gofmt