[shape-plan] Refactor more
1 file changed