Cleaned Up model.py