Better extraction of email and author names (with separate methods) + some docblocks