Continuing refactorings