Commenting fixes
Started the change of the control structure