some renaming and refactor toward usefulness