cleaned up some of the mess