Removed codenarc issues
Remove codenarc issues