some more formatting fixups