Bumped deps
Refactored