tidying up main.go