Replace the use of globals in CommentReport with DI