- removed unused variable and renamed class