Commenting sponsor fragment and general tidy up