docblock pasring refactor