Made comparisons / toString() more efficient