Use ranges
Remove some brackets