simple refactor
simple refactor