#3 A simple  refactor