Clean up & fix examples