comment author + some refactoring