Removed if else statement