Added Eloquent, tidied up CommentScanner