update

make code more clean