code clean up
reformat code
setting external properties path through jndi