Cleanup

Doesn’t completely work, but in better order.