Split out Wheel assembly, tidying