Xform mostly cleaned up, league controller