Move the conditional sub-section into the formatting section. 

Also add a section on single line conditional and loop bodies.