Some changes for hound to test

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