Improve style and conciseness (part 20)