Better if/else handling