Clean up solution a little bit