Cosmetic changes + comments