Rework CLI Args