clean up
don't put formal parameters in nested scopes