refactor code delete happy