Solve problem 22
Refactor solution file