Re-format if/else