Cleanup

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