Refactor inline with new in-code documentation