annotations and refactorings