Added examples
More cleanup