Changed the If-Stmt to have blocks evenif they don't have so that we can insert our IFC statements easly. Changed the return statement to hoist expressions.