Some minor refactors to better suite the documentation.