More minor cleanups on Ui class