Cosmetic and refactoring changes