bugfix
bugfix - added log4j dependency
light refactoring