Refactoring, last round