Comments and code factoration