Improve style and conciseness (part 19)