Fix warnings remove redundant code, code dublicates

[BrianNichols]

This pull request contains style changes that conflict with the style in the rest of the library. Can't accept this one.