Added the cleaned up solution.