issue-1216: improved code quality