#989: best practices - improved readability

Change request updated