I4: comments to refactor