General comments clean up