fix formatting of: for, if, while, switch closes #3136 refs #3137