cleaned up messaging