removed circular definitions in comments