ENG-6137: Readability cleanup