Cleaning up and making look better