code clean up and jms module added