Cleaning up some