formatting and shorter syntax for improved readability
Merge pull request #567 from capaj/master

formatting and shorter syntax for improved readability