refactor(ui): cleanup variables namespace