Clean up
In order to appease Chris Elsmore