Cleanup of itemmodels.py