cleanup and appearance tweaks