A few perlcritic fixes