refactoring for githup