Fix misplaced comments