Some clean up
Minor things
A good day's work