Cleaned up/reorganized cmp_item code