Improve style and conciseness (part 15)