cleanup, changed position of calc data to fodft.py for easier edit