Improve Code Climate score

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