Dino catalog/mohammad

Avoid using {...} for multi-line blocks.