--minor refactor.