improved formatting in general
Merge pull request #17 from harbieism/master

improved formatting in general