refactor code -1 remove