Add logger
Clean code
Fix [SonarQube] System.exit(...) should not be called
Fix [SonarQube] System.exit(...) should not be called