Annotation checking; Refactoring