cleaned up some more stuff