Checking some files and cleaning the code