cleaned up a bad copy/paste in a few if statements