Minor refactor in author-enhancements