Commenting
More commenting and cleaning