commit refactoring before merge