Minor refactoring, equality now checked strictly