clean up
clean up
clean up
make data attribute in sendMessageToJava consistent