Good refactor. Thanks.