Refactored the Octokit specific code
Refactoring and conflict fixing