Refactored Space Logic and Passover/Landon Logic