let’s refactor