Refactor the code to be a pre-processing task.
Return proper node types for initial values