refactoring Uba class