cleaned up messaging types