Style suggestions

Several style suggestions for you to consider.
Merge pull request #1 from anasazi/patch-1

Style suggestions