refactoring of get completed
refactoring of remove done