Refactoring: use strict comparisons