Minor refactoring of units.

Changing all units to be consistent in design, methods, and comments.