
            Further refactor.

785f318