Get rid of unneeded defaults and use concrete class comparison for objects rather than instance Class