Working refactor