Use statement blocks consistently