Refactors messaging to leverage completeness checking in the receive methods. Also reformatted the code