removed if/else