Formatting fix and add SWAP gate.