Moved comments to the bottom
Further refinements, removed the centroid markers