refactoring ready