Re-ordering stuff for style.
Adding comments.
Improving init docstrings / docs.