Code cleanup and visual tweaks.