Reformatted some if-else statements to the more common format