removing log4j and code formatting