Refactored annotation extractor to be able to properly extract multi-line annotations with @ signs as values (such as email addresses)