New runnable JAR, small refactoring