Attempt to fix up cli help message format