refactor for gitrepowq