start commenting in refactoring changes