Some cleanup of formating and usage examples