Address various codacy issues

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/address-codacy-issues into master

Created by: chuckatkins

Merge request reports