Simplify solution structure