ENH more prettifying