File code cleanup and org for wfm and scn.