Clean up module behaviors
Correct MessageFactory