removed extra if statement