- Cleaning up and adding comments from the examples