cleaned up more if statements