Classes refactoring^2