Other minor refactor.