Refactor SolutionRectangle