Github URL, some more refactoring