Some manual cleanup, visual tweaks.