Simplification of complexifier & logic tidying