Refactor and add author tag.