simplify code
simplify code
minor update