Improve style and conciseness (part 14)