add space after if, improve while_statement_to_firm