Better if/else/end alignment