cleaned up unneeded if statements