ufm: code cleanups