Better comments formatting