Fixing Codacy bugs