Revert "Revert "Improved formatting""
Merge pull request #4 from IonicaBizau/revert-3-revert-2-patch-1

Revert "Revert "Improved formatting""