refactor(ui): cleanup initial data fetching code