Refactoring  to