Simplify the Problem 8 Solution even more