Bug fix -swap check was incorrect, fixed logging statement and renamed the swap check method
Minor log change -happy path