Removed if/else block