Refactors messages a little bit