Cleaned up model