refactoring of annotations

Minor refactoring of annotations to avoid breaking any PBC contracts.