formatting and applied suggestions
Merge pull request #3 from thinkaliker/master

formatting and applied suggestions based on Mike's suggestions