Cleaned up docstrings and renamed methods for consistency