flowprogrammer style fixes