Cleaned up parts of examples