More cleaning the code and files