scenario cleanup

Backporting from rev1.

Cleaned up indentation. Use quotes for meta keys to resolve symbol syntax issues.