Cleaned up the formatting of some if statements