Cleaner management of pointers
Fix indentation
Add -XDoAndIfThenElse flag