Some more beautification