added log4j 2
small refactoring