code, UI clean up etc