Refactored code comments