Some code cleanup
Replace sourceSingle with yield
Fix some comments
Redundant comment