Xlform file refactor