Simplify solution