refactored user_messages to messages, tests passing
refactor user_messages