Cleaned up changes to examples