Minor Refactor.