Continuing refactoring