Fixed some returnvalues to satisfy perlcritic