Remove a const_defined? check
Prefer self.class.name to self.class.to_s