Refactor AuthorName