Clean up Docs

A bit of minor internal refactoring.

Closes #15