Sliding the swapped out match answer, and other code review feedback.