Improved logging using log4j