Upgrade java and slf4j
Refactoring