refactored, removed class in neitzmodel.py