Improve style and conciseness (part 3)