Refactor documentation - 2