Refactor to add destructuring