Consistency updates

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