Clean CLI

Add DEMO.bat in order to test CLI
Improve code for CLI and CLI interface