renamed class and commented