cleanup cli config and params, code was messy
v0.6.5