Start refactoring Comments F.E.