Cleaned up the code data model.