Cleanup

- Just a small cleanup before doing one more UI change