address various codenarc rules