Cleaning up solution a bit