Simplify solution to problem #8