+ code review: code clarity improved