Made list of forms consistent
datarule cleanup