t0030: Remove repeated instructions and add missing &&