cleaning up some things:)