Consistency updates

Several updated for code consistency.  Attribute ordering, consistent attribute usage, white space, etc...
Consistency updates

Missed a couple.
Merge pull request #33 from nhall/patch-1

Consistency updates