better cli handling and formatting