UI, code cleanup