Simplify the solution's structure