Commenting and cleaning code