Some more beautification from TheoRettish