Minor Changes

cosmetic layout and UML based changes.