Small refactor + Update deps