Refactor messages for consistency