[dev] Cosmetic changes