Cosmetic fixes & comments