Clean up of ConsoleApp.java