Polish Messages pg, refactor