Add comments/docstrings
Reorder methods