Minor changes.

Refactorings.