comment format improvements