Removing the extra if