Refactoring and more combinators