Simplify some convoluted logic