Makes yield syntax consistent
Adds additional code comments

Adds additional code comments in the main layout.