Simpler logic