better CLI readability

fixes #2080