Cleanup
Tune up with scope, cleanup