code cleaned
fixed everything