Refactoring, no specific modification