refactore uvMping