Docs update / small refactor