- Compare classes and not names.
- Removed unneeded code from constructors.