Refactor problem 1.