perlcritic cleanup
even more careful about returns which perlcritic fails to warn about