cleaning up some of my mess