Some code cleaning and creation AnnotationFactory