Cosmetic changes and updates