Progressing through refactoring