refactor code for id/path change