copy/paste internal class
summarize folded annotations
some cleanups