simplify code

simplify code at line 251
removed_quotes