Fixed d()V and diddid some clean up of methods before that