Documentation tidy up.
Clean up refactoring