And some more refactoring around the Github client