Consistently added [ ] around return values