Change request #989: best practices - improved readability