Updated
Clean codeing ...
Working on CLIFramework:
CLI Update