Nicely done on the refactor.