moar tidying
Final Transition...

and I'm out