Changes to make perlcritic level 4 happier
Perlcritic Level 3 fixes