See below
Cleanup beautiful clean up