simplification commenting and deleting