Refactoring, extensions