Updated internal comments