code cleanup added a AnnotationUtil