Cleanup

Hopefully this is clearer.