master: more experimenting with formatting