Cleanups: Add comments to ease code understanding
Typo