Better comment organisation