Reformatting if statements to more standard layout