HeaderDoc, refactor