refactor out cli
1.0.4