Minor tidy up
Adjusted correctness algorithm slightly