Yet more prettyfication