Reduce redundancy
Adequate CLI script done