Completing last refactor.