Codacy Changes

Codacy Changes