Various style/small fixes
New cleanup options tests
Updating Cleanup usage with new options