Make if statements uniform