refactor, update deps