Non functional changes towards shared functions in Core_Form_Task