fix remove redundant return statement
fix breakup large conditional return