A bit more beautification