UF-70: some improvements suggests by @porcelli on his review