clean up a lot of codenarc warnings