Minor structure improvements
log4j configuration improvements