Remove trailing whitespace, and other small changes
Clean up examples