Changed compare() method for more simplicity
Aesthetic changes