Refactoring

Cosmetic changes.