minor renaming + comments in MessageRepository