[Evaluation] coding convention fixes