Added documentation to units, fixed stylistic errors, removed overly com...

...plex inheritance schemes