some renames and some docstrings
Minor readability improvement