clean up header files
Add receive message feature