refactor, rename, docs