Cleaned up naming and docstrings