Added Class UML Diagram and Cleaned up redundant code
Merge