Cleaned up some example code