A simple refactor