Continuing refactoring work