clean up and go fmt