Simplifies some examples
Clean up