First version of refactored cleaner