Refactor for Repository inspector