Stylistic improvements to 07s
Merge pull request #28 from Slava/master

Stylistic improvements to 07s