Improve structure of combinators