Refactored code to github service