Refactoring, conclusion for the basic part