Improve style and conciseness (part 13)