REFACTOR: Cosmetic changes
Uncommented cod