Improve style and conciseness (part 22)