Fixed codenarc errors