cleaned up using "go fmt"