cleaned CLI a bit