more return fixing
refactor-2 scrip: if/else(if/else) -> if/elseif/else