Code cleanup
Work on dispatch message publisher