Looks generally good, but it would be nice if you could avoid introducing new overly long lines. Then again this really won't be noticed in udf anyway and it looks like you plan to clean it up later anyway.
(in case it wasn;'t clear count this as an ack from me)