ECDR-48 Made minor code changes for Fortify scan issues marked as "High"



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/di2e/ecdr/24)
<!-- Reviewable:end -->