:+1:  on the refactoring here.