style cleanup, a couple conditions destupidified