Cleaning
Simplified combinator types, closes #74