Cleaning up Example code