Minor tidying

Still has an issue when oscillating between tweedledee and tweedledum