Comments changed
Refactored code