Very nice refactor, thanks.