add nocritic for dump eval and add explicit returns to a couple subroutines