Mainly perlcritic changes