Refactoring: ?