Documentation fixes from refactoring