another refactoring started