cleanup, reqs, renaming