annotations refactoring