cleaned up some things