Remove formatting from message to make it terminal friendly
Minor comment cleanup
Usage message improvements.