Slight optimizations
Clean up examples