Cleaned up in examples