Add curly brackets for all if/then/else to meet CS