simplify code

simplify code at line 251