Minor changes to conform to coding guide

First pass at making the cod conform to the coding guides. Primarily concentrated on getting the mulitple include definition conformant. Also tried to change order of private and public as well as removing functions the compiler will properly generate.