annotation refactoring