cleaning the code and add of coms