finished log4j refactoring