Improve style and conciseness (part 21)