Some refactoring, github works