Getting rid of unnecessary code and empty lines
Merge origin/master