Removed the equals method and other refactoring.