Refactoring Issue