Finish second refactoring