author tags and refactoring