Confirm refactor