cleaning up some more code