Cleaning the code a bit
Cleaning code
Merge remote-tracking branch 'origin/master'