Refactoring
Upped dependencies