Update: use Objects.equals for cleaner code