Refactor.

Refactor.