Refactoring and cosmetic changes.