Cleanup
more cleanup, esp on %change