finish refactoring messages