U-4 Refactore 'Comment' into 'Evaluation' model object