Clean up run.go