got rid of if