Cleaned up and added a little more demonstration