Removed extra if statements