Updated dependencies and cleaned up a bit