Commenting and cleaning up files