Minor cleaning
Minor cleanning