More Codacy changes

Changes reviewed by Codacy