Updated dependencies, a bit of code cleaning