uf refactoring adjusts