Refactoring
Cosmetic changes