cleanup cli config params, code was messy