Style cleaning-up
Merge pull request #7 from powerist/working

Style cleaning-up