Refactor as you document