cleaning up and whatnot