Restructure and add comments

Restructure and add comments