cleaned up some of the mess I had created