Removed elsif logic