Added comments to Cluster and Location