Simplifies some examples and adds comments