Refactor git master branch