swith log to logback & refactoring