Clean up edit,add,copy,delete,done section code