Addressing comment, simplying conditional