refactor list, add and delete case statements
refactor complete case statement