Cleanup and number tweaking