simplify and clean up messaging