Yet some more beautifying