Some improvements, cleaning and others
Minor update