Prettifying the code
Merge origin/master