refactor-change ++id to id+1