fixed codenarc issues