Updating dependencies, cleaning up a bit