Minor code modifications
Merge pull request #2915 from dnikolop/performance-scripts

Validation/Performance -- Minor code modifications