Final cleaning
Update to run script
Minor patch