Annotation re-factory + Cosmetics