tidy up solution