Small Refactoring, Class Diagram Updated

Small Refactoring, Class Diagram Updated