Minor cosmetic changes
Fixed JNDI injection