Refactor problem