makor refactoring