Fixed a few codenarc errors