Minor re-org and  comments