Tidying up some solution stuff...
Tidying up more solution bits.
Some small meaningless changes.