Change to if/else to match code style