+1 for the refactor