Code review: Avoid using {} for multi line blocks