remove some unusfull lines
add/change some code