clean_up finished
clean_up and fixed the code