Refactoring renaming method, updated docstrings