[MOD] Cosmetic changes