fix clear issue
better namin convention
better namin convention
events to messages. REfactor accordingly
rename messages