simple refactor to simplify