Updated deps and minor cleanup.