Fix a syntax error & have if-conds in an own line