Update dependencies and minor cleanup