Fix Codenarc issues