misc reformating
Merge pull request #6 from charkost/master

misc reformating