MOD: minor refactor.