refactoring of annotations