refactoring, simpler messages