Refactoring & bits of documentation.
_