- update packages
- small refactoring