refactoring annotations