Cleaned up code samples
More code sample cleanup