Clean Up

Here (Tom) is cleaning up some code.