Cleaning up & moving messages to own include files