Fixed Codacy issues