update the whole repo, small refactoring