Refactor: Use if for two-way branching; Compare against 0 explicitly