cleaning up freeform parser #28 $29