Fixed indentation for cond
WIP

- uses #45
- cleanup