Tail work

Cleaning up is cleaning up.