Tidy and tweaks.