Improve style and conciseness (part 9)