Adding a cleaner abstraction for easier backtrack.
Really adding the cleaner.