+1 for the renaming and addition of docstrings