Attempting to fix Codacy issues