07: formatting improvements