* update deps and refactor (silverwind)