Made the if statements even better