Some prettifications
Merge pull request #20 from anas-ambri/prettify

Some prettifications