Minor cleanup.
Refactoring for cleaner OOP.