Shortened some if statements