Updated documentation and code cleanup associated with recent refactoring.