Upscale and clean up