Refactor.
Housekeeping.