Cosmetic changes (comments/ui)