cleanup, mostly better naming