Refactor Annotation Scanning