refactor assignment and fix assignment origin question title