refactor a bit pomessages