Cleaning up log4j logging
Logging updates