Slight buff .equals() changes

Now with less if.