code more clean

code more clean