Code cleaning
Minor fixes
Code cleaning
Minor fixes