Refactoring before merge