CDR-8: formatting fixups to plan