[WORKING?] Refactored code correctly. No System.Out/In outside CLI package.