fix some more codacy issues