That conditional can be simplified significantly