Enhance code structure and comments.
Collapse comment block