master: more fiddling with formatting