fixup formatting for: while, switch and if refs #3137