Added comments and modified Class-names
Added comments and modified class-names
Updates