Cleanup. Bit of UI improvement