Cosmetic changes (modernized)