Refactor 2 SolutionRectangle