Fix "improvement"
Improve style and conciseness (part 6)