pom fix
refactoring
logging fix