removed non necessary class, added comments