Updated dependencies and added some code style updates