more github refactoring