Updated Comments to standard ones