Cleaning and formatting code
Merge remote-tracking branch 'origin/master' into master2
Cleaning and formatting code