Cleaned up solution for 19.