removed redundant class
additional code comments