Tidy up in tov.py and makeeostable.py