Adding another example and cleaning up