cleaning up some of the code