HW18: Cosmetic changes