refactoring of annotations

minor refactoring of annotations to avoid contract breaks