Refactor author parsing