cleaning up some of the previous mess