refactoring, general progress