Improve style and conciseness (part 18)