few more changes
Merge pull request #10 from daruane/formatting

few more changes