More refactoring and improving of messages