Fix more Codacy issues