cleaning the code, setpping