Improve formatting
Merge pull request #16 from ZDroid/formatting

Improve formatting