cleaned up some more code