Improve style and conciseness (part 11)