Made corrections to the class
Made corrections to the class