rename goals
extract steps from inner to outer level