Cleaning up main.go