Removed unnecessary if/else