Cleaning combinators

See #101