Updated dependencies, updated docs, cleaned code