- Refactored code to work with the new expect_any_args plugin
- made the cleaner much cleaner