cleanup and update to add creation of items