Tested + cleaned up examples