simplify messages structure