Messages Polish & refactor