comment progress. refactoring