Fix codacy issues