continuing refactoring