Refactor message passing
Cleaning up a little bit