Small refactor.
Another small refactor.