Little combine and refactor